Tag 'fixme = resurvey and fix tagging'